account/models.py

@@ -335,7 +335,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                     login_at = models.DateTimeField(_(u'login_at'), blank=True, null=True, help_text=_(u'登录时间'))
              

                 
              

                     has_membercard = models.BooleanField(_(u'has_membercard'), default=False, help_text=_(u'是否激活会员卡'), db_index=True)
              

                -    membercardid = models.CharField(_(u'membercardid'), max_length=32, blank=True, null=True, help_text=_(u'会员卡编号'))
              

                +    membercardid = models.CharField(_(u'membercardid'), max_length=32, blank=True, null=True, help_text=_(u'会员卡编号'), db_index=True)
              

                +    memberusercardcode = models.CharField(_(u'memberusercardcode'), max_length=32, blank=True, null=True, help_text=_(u'用户会员卡编号'), db_index=True)
              

                 
              

                     test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
              

                 
              
@@ -390,6 +391,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             'phone': self.phone,
              

                             # TODO: Diff for Brands
              

                             'has_membercard': self.has_membercard,
              

                +            'membercardid': self.membercardid,
              

                +            'memberusercardcode': self.memberusercardcode,
              

                             'saleclerk': bool(saleclerk_info),
              

                             'saleclerk_info': saleclerk_info,
              

                         }
              

kodo/oauth_settings.py

@@ -33,15 +33,16 @@ def DJANGO_WE_MESSAGE_CALLBACK_FUNC(request, data, decrypted=None):

                     """ WeChat Message Callback Func """
              

                     from account.models import UserInfo
              

                 
              

                -    event = dict(data).get('Event', '')
              

                -    fromusername = dict(data).get('FromUserName', '')
              

                -    unionid = dict(data).get('UnionId', '')
              

                -    membercardid = dict(data).get('CardId', '')
              

                +    event = data.get('Event', '')
              

                +    openid = fromusername = data.get('FromUserName', '')
              

                +    unionid = data.get('UnionId', '')
              

                +    membercardid = data.get('CardId', '')
              

                +    memberusercardcode = data.get('UserCardCode', '')
              

                 
              

                     if event == 'user_get_card':
              

                -        UserInfo.objects.filter(unionid=unionid).update(has_membercard=True, membercardid=membercardid)
              

                +        UserInfo.objects.filter(openid_miniapp=openid).update(has_membercard=True, membercardid=membercardid, memberusercardcode=memberusercardcode)
              

                     elif event == 'user_del_card':
              

                -        UserInfo.objects.filter(membercardid=membercardid).update(has_membercard=False)
              

                +        UserInfo.objects.filter(memberusercardcode=memberusercardcode).update(has_membercard=False)
              

                 
              

                 
              

                 def DJANGO_FILE_UPLOAD_CALLBACK_FUNC(request, file_path=None, file_url=None):